Merge from trunk
authorDavid Engster <dengste@eml.cc>
Sat, 27 Jul 2013 21:04:38 +0000 (23:04 +0200)
committerDavid Engster <dengste@eml.cc>
Sat, 27 Jul 2013 21:04:38 +0000 (23:04 +0200)

Trivial merge